yes added some more things: