Temp code removed