Refined more, ready for demo