updated for 0.3