more updates with the simplification