Updated for bevel