removed ENV condition for testing