Final commit: Everything is fine now