updated to fit 0.4.7