Performance increase and debug info