buff underconstruction

conflict fixed