I'm commenting that part of code again and merge this as is but we need to take a look at it