michael's fixes