updated to latest changes in Hercules