Debugged some issues nothing new added