Trying to put needed declarations earlier