TODO to do (haha)
Just soome little modifs