Added UI to help test the issue