Updating with old modifications

Hopefully more to come soon.