Demo V1 + some bug fixes