Change some logic for GUI use