Edited assign7