Rewrote bath checking