many changes, big fing overhaul