updated original fork for my setup