some simple changes)