keep client stuff together