Fixed The Caldenar issues and Added peters code