fixed the assignment issues