some changes - talk with me if something is unclear.