Newest changes to code