even more ugliness elimination