added TODO
removed demo functionality