changed schema ordering
removed listener