actually that was bad. more elegant, now