update, ready to migrate to 0.5