Some tweaks for demostration