seperated current from p5 version