Michael's modifications