Some more changesh