renamed and broke the assignments into two