cleaning up and new demo