filling in more stuff