Updated after ripping out experiment with dialog