All working and updated now