arrange other parts a bit more efficiently