trying to make final version works