23.11.2013  Some refactoring