CAL refactor- Bug fix