Add back in features overwritten from pull