Edit Inplace: improve composer