removed hardcoded locations