Improved Campus Party

Change-Id: Ice94716970a084dfadcce24d7bb7fc60436d7947