Updating for Yadda 0.6.2