updated for ZoL 0.6.1