Finished to implement opacity management