Marce's changes