made it faster while trying to be safe