some changes - not finished yet