Follow more mako guideline + should ix battery charging