changes from alexander makarov