Changed the logic of weekday? and weekend? methods