updated for dev-0.3 compatibility