Some changes 13-05-2014
After pilot conversion!