Change static to normal for variables