move some code around for later (nw)