slightly better -l mode