Demo is a whole lot better now