ok - if the extra method call doesn't bother you then I can change it.