Upload changes from wapatoo