rework/add/remove stuff