Adding back in a few things too hastily removed