updated for 0.45