Updated for BOGO 1.0.1