Moved to research at ATC, multiple enhancements on the backend