Updated with bug