Updated with wastages