Fixed some variables to keep everything necessary static