added in the final pieces