Butchered it / made improvements

Mostly butchered it though.