cleaner code, proj02 args added