Adjusted for Debugging