Got it, will refactor, any specific input?