Added changes to Yamba project