working on demos and making more consistent