3.22 Bump out and Clean up