Updated with new fixes.