Even cleaner implementation!