well, both approaches can be justified so lets keep this as it is.