Final Changes

For now this is the last version.