Re-added the things I accidentally deleted