Updated for latest sguil