sOME mORE mODIFICATIONS