Assignment3 Edited