Made Michas changes