September commit

Retake in Sept 2014