Edited static to non static