Making it more robust