Modifications for Imagine Cup demo