Updated GetOrigin method