massive last minute simplification