Made Bayo's changes