Some more tewaking