little changes - still not finished