Reverted back to some optimized checks