Added in size and opacity checks