Making it ready for random splashes