removed verbose conditions