fixed initialize to support tracking