added remaining pieces back in