Can't this be moved into definitions?