merge with sooke-0.2