stuff for Andre to Fix :)