temp changes to make it work with non L builds
add support for calories consumed