Updated with terminator