updated for 0.99.2 post