Input from text enter
Merge branch 'activeWork'