Final Revision v1

Maybe done?