optimized must use rule, changed back to timothes version except
duplicate rule fix