for now yes it does and it is a minor thing to extract that later