Small speed up try - found in Carrots speedup