final changes - beta - overflow etc.