Major changes

2014-12-22