Added back items which we removed earlier