Updated from 0.6.4