Added Michael's changes