some changes 2014=)