hcar stuff
pull changes from master