major -withInput- bugfix/shorten