Assignment 4, new design