I have removed that logic