updated before marge