Updating for version 0.6