a little bit cleaner now...