Omitted some stuff I accidentally included