sort out architecture funniness