[CHANGE] Changes

Changed by comments