Incorporated Michael's changes