package things a bit more