updated to latest sir trevor