Changes to Final Stuffs

More stuff