Added Faulty behavior. And this complicated life a lot! Need to refactor