FInal set of changes for demo..