some more stuff for cleaner integration