Updating for 0.6.5