removed hardcoded location return for testing