next attempt on #35 :)