Some additions and changes made on 20140126