More up to date code