Added annotations.
Changed location of cast.