few modifications i made yesterday