Final Improvement

Probably the final commit