Demo 1 code freeze