updated for 0.5.0 compatibility
0.3.0