Try some efficiency improvements