Additions from Hugbot