Updated with bug info