updated to ray's new version and added parts
updated to ray's new version adding my locations part to his files