adding my newest changes
manually merged some settings