Added Logs. BugsFixed