rework in progress .. changing many things...