--[Fixing With more options and fixing toggles]--