this is a bit cleaner now