Added more design... need to clear some extra design...