Changed to OO style. I dont know why.