Some changes from email 23.6.2014