further simple changes