lost track of changes, all the fixes into one commit