some changes .. temp