Added back my original modifications