Made my own changes