Marke's changes