refactor calendar with not working basket