Updated for opacity