Ckozak/some changes