simplification/taylorization and fix