Now updated for 0.6.3