better but still ugly