Updated changes related queues and removed the bugs related to that !