Trimming all this down significantly