mikko's changes done