and an enhancement for a prior felony conviction