Finishing, moving to API 0.6