updated for 0.5.2