added new day functionality, refactored selector code