adapted to my repo