Removing static calls. thanks George.