Changed dates already taken
Begin code refactor