Assignment1 reorgnized