updated for 0.2.2