Re-write assignment

Re-write