3,madigan6: reverting back because daniel's caused crashes