Major changes done on clac