Updated With GUI