Reorganized mwfit source