Barely any changes. Removed comments