Improved Boulder class