forward & return functionality added