little modifications for edwin