Updated with dimers