changed around stuff