Pulling in changes from shrimpboyho