moved static to the right location