done as much as I can stand today for #142