Added GUI & Improved condition checking