BugFixes-  Feature adding