A bit more efficient and working better

Need to move to new line kernel next