change from static to not static