Added missing pieces