Updating to beta 0.8