updated to support py26