Way cleaner version