Removed removal of nocrits and added short timer.