first steps to fix this stupidity