Edited Cal a bit