Initial version with wave and all on demos