updated with new location methods