removed unecessary thing to save battery