Some more changes

To achieve perfection