Completed GUI Version 2