now I'm actually adding all those stuff I taled about