Made it more bullerproof-er