added option for not charging and charging