Added more behind logic for GUI