removing angular per SJW, adding categories