trying to fix removed stuff