Updated for relase builds