Changes to adhere to Final Milestone Requirements, some things may be broke