made it more static