fixing up my fork