This bit still looks like it's duplicated.