Some minor changes. Not working