updated for 0.7.0 instead of 0.6.4