integrate some more stuff!