fixed merge, ready for demo