OO Fixe 

Signed-off-by: luuxx <luuky19@gmail.com>
OO fixe part 2
OO fix part 3