Down and dirty re-code to fix issues with input calls