final changes to be ready for demo