Initial changes for GUI