Trying some editing of the old assignment to match these specifications