Added normalDay and testDay and misc other stuff