Combine steps 5 & 6