merge mansy's work