Performance improved in setup
Performance improved in setup II