Added smart forward