totally redid pyb stub