updated for 0.3.6