some changes, test mode for annie