updated annie (not tested)