changes - nothing finished yet