Updated with peoples' suggestions