Some extra optimization