first
added some more stuff