Rest input changes
Merge https://github.com/pjesudhas/DisKoverorTA