update: fixed charging incoming redirection
update: cleaned up code. fixed call timings