Merged Simon with Master (fixed the commit before)