cleaner version of what I just pushed ;D