updated to support 0.7