Final Commit and ready for super CF fighting