Added fannotate and assign