fixing cal issues