Removed mp construct
Updated