magda's changes, fuck github.. sometimesB