Improved the Assignment part.