removed INPUT from code
Fix merge conflicts, update log statements