fixed forward & add demo