added fetch logic