Actually made it more robust