This commit is with the work done for meeting on 2013-11-26