Updated missing pieces :/