Imporvements by panakaj
 df