Debugged Fixes