UPDATED TO 0.6.7