magda's changes, fuck github.. sometimes