RP-248 Add currents and remove flags