Merging the AppDays final version #2