Edited the error in edit method and updated more of Tick and CMI
functions