Reverted back to previous contains