some changes as on 25.12.2013