Enhanced input handling for get_current method
Merge branch 'testing'
updated input handling fir get_current