fixing oo stuff