Just some simple changes