preparation for rbs and some changes at project