[UNTESTED] I think you'll love this update... :)