modified to work with my fork