sorting out some mess