changes to match flopmang as required on #65