updated for version 0.4