Refactor prop simulation interface: updated DataFrame columns to include 'Trending Over' and 'Trending Under', reorganized layout for better usability, and improved simulation logic for player props. Enhanced data handling for prop categories and added functionality for downloading projections.

app.py

@@ -147,7 +147,7 @@ prop_format = {'L3 Success': '{:.2%}', 'L6_Success': '{:.2%}', 'L10_success': '{
 all_sim_vars = ['NFL_GAME_PLAYER_PASSING_YARDS', 'NFL_GAME_PLAYER_RUSHING_YARDS', 'NFL_GAME_PLAYER_PASSING_ATTEMPTS', 'NFL_GAME_PLAYER_PASSING_TOUCHDOWNS', 'NFL_GAME_PLAYER_PASSING_COMPLETIONS', 'NFL_GAME_PLAYER_RUSHING_ATTEMPTS',
                       'NFL_GAME_PLAYER_RECEIVING_RECEPTIONS', 'NFL_GAME_PLAYER_RECEIVING_YARDS', 'NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS']
 pick6_sim_vars = ['Rush + Rec Yards', 'Rush + Rec TDs', 'Passing Yards', 'Passing Attempts', 'Passing TDs', 'Completions', 'Rushing Yards', 'Receptions', 'Receiving Yards']
-sim_all_hold = pd.DataFrame(columns=['Player', 'Team', 'Book', 'Prop Type', 'Prop', 'Mean_Outcome', 'Imp Over', 'Over%', 'Imp Under', 'Under%', 'Bet?', 'Edge'])
+sim_all_hold = pd.DataFrame(columns=['Player', 'Team', 'Book', 'Prop Type', 'Prop', 'Mean_Outcome', 'Imp Over', 'Trending Over', 'Over%', 'Imp Under', 'Trending Under', 'Under%', 'Bet?', 'Edge'])
 
 tab1, tab2, tab3, tab4, tab5, tab6, tab7 = st.tabs(["Game Betting Model", 'Prop Market', "QB Projections", "RB/WR/TE Projections", "Player Prop Trends", "Player Prop Simulations", "Stat Specific Simulations"])
 
@@ -476,334 +476,347 @@ with tab7:
               non_qb_stats = non_qb_stats.drop_duplicates(subset=['Player', 'Position'])
               team_dict = dict(zip(prop_frame['Player'], prop_frame['Team']))
               t_stamp = f"Last Update: " + str(timestamp) + f" CST"
-    col1, col2 = st.columns([1, 5])
-    
-    with col2:
-        df_hold_container = st.empty()
-        info_hold_container = st.empty()
-        plot_hold_container = st.empty()
-        export_container = st.empty()
-    
-    with col1:
-        game_select_var = st.selectbox('Select prop source', options = ['Aggregate', 'Pick6'])
-        book_select_var = st.selectbox('Select book', options = ['ALL', 'BET_365', 'DRAFTKINGS', 'FANDUEL', 'MGM', 'UNIBET', 'WILLIAM_HILL'])
-        if book_select_var == 'ALL':
-            book_selections = ['BET_365', 'DRAFTKINGS', 'FANDUEL', 'MGM', 'UNIBET', 'WILLIAM_HILL']
-        else:
-            book_selections = [book_select_var]
-        if game_select_var == 'Aggregate':
-            prop_df = prop_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-        elif game_select_var == 'Pick6':
-            prop_df = pick_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-            book_selections = ['Pick6']
-        st.download_button(
-            label="Download Prop Source",
-            data=convert_df_to_csv(prop_df),
-            file_name='NFL_prop_source.csv',
-            mime='text/csv',
-            key='prop_source',
-        )
-        if game_select_var == 'Aggregate':
-            prop_type_var = st.selectbox('Select prop category', options = ['All Props', 'NFL_GAME_PLAYER_PASSING_YARDS', 'NFL_GAME_PLAYER_RUSHING_YARDS', 'NFL_GAME_PLAYER_PASSING_ATTEMPTS', 'NFL_GAME_PLAYER_PASSING_TOUCHDOWNS', 'NFL_GAME_PLAYER_RUSHING_ATTEMPTS',
-                                            'NFL_GAME_PLAYER_RECEIVING_RECEPTIONS', 'NFL_GAME_PLAYER_RECEIVING_YARDS', 'NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS'])
-        elif game_select_var == 'Pick6':
-            prop_type_var = st.selectbox('Select prop category', options = ['All Props', 'Rush + Rec Yards', 'Rush + Rec TDs', 'Passing Yards', 'Passing Attempts', 'Passing TDs', 'Rushing Attempts', 'Rushing Yards', 'Receptions', 'Receiving Yards', 'Receiving TDs'])
-
-        if st.button('Simulate Prop Category'):
-            with col2:
-                   
-                    with df_hold_container.container():
-                        if prop_type_var == 'All Props':
-                            if game_select_var == 'Aggregate':
-                                prop_df_raw = prop_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-                                sim_vars = ['NFL_GAME_PLAYER_PASSING_YARDS', 'NFL_GAME_PLAYER_RUSHING_YARDS', 'NFL_GAME_PLAYER_PASSING_ATTEMPTS', 'NFL_GAME_PLAYER_PASSING_TOUCHDOWNS', 'NFL_GAME_PLAYER_RUSHING_ATTEMPTS',
-                                            'NFL_GAME_PLAYER_RECEIVING_RECEPTIONS', 'NFL_GAME_PLAYER_RECEIVING_YARDS', 'NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS']
-                            elif game_select_var == 'Pick6':
-                                prop_df_raw = pick_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-                                sim_vars = ['Rush + Rec Yards', 'Rush + Rec TDs', 'Passing Yards', 'Passing Attempts', 'Passing TDs', 'Rushing Attempts', 'Rushing Yards', 'Receptions', 'Receiving Yards', 'Receiving TDs']
-                            
-                            player_df = overall_stats.copy()
+        
+    settings_container = st.empty()
+    df_hold_container = st.empty()
+    export_container = st.empty()
+
+    with settings_container.container():
+        col1, col2, col3, col4 = st.columns([3, 3, 3, 3])
+        with col1:
+            game_select_var = st.selectbox('Select prop source', options = ['Aggregate', 'Pick6'])
+        with col2:
+            book_select_var = st.selectbox('Select book', options = ['ALL', 'BET_365', 'DRAFTKINGS', 'FANDUEL', 'MGM', 'UNIBET', 'WILLIAM_HILL'])
+            if book_select_var == 'ALL':
+                book_selections = ['BET_365', 'DRAFTKINGS', 'FANDUEL', 'MGM', 'UNIBET', 'WILLIAM_HILL']
+            else:
+                book_selections = [book_select_var]
+            if game_select_var == 'Aggregate':
+                prop_df = prop_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+            elif game_select_var == 'Pick6':
+                prop_df = pick_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+                book_selections = ['Pick6']
+        with col3:
+            if game_select_var == 'Aggregate':
+                prop_type_var = st.selectbox('Select prop category', options = ['All Props', 'NFL_GAME_PLAYER_PASSING_YARDS', 'NFL_GAME_PLAYER_RUSHING_YARDS', 'NFL_GAME_PLAYER_PASSING_ATTEMPTS', 'NFL_GAME_PLAYER_PASSING_TOUCHDOWNS', 'NFL_GAME_PLAYER_RUSHING_ATTEMPTS',
+                                                'NFL_GAME_PLAYER_RECEIVING_RECEPTIONS', 'NFL_GAME_PLAYER_RECEIVING_YARDS', 'NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS'])
+            elif game_select_var == 'Pick6':
+                prop_type_var = st.selectbox('Select prop category', options = ['All Props', 'Rush + Rec Yards', 'Rush + Rec TDs', 'Passing Yards', 'Passing Attempts', 'Passing TDs', 'Rushing Attempts', 'Rushing Yards', 'Receptions', 'Receiving Yards', 'Receiving TDs'])
+        with col4:
+            st.download_button(
+                label="Download Prop Source",
+                data=convert_df_to_csv(prop_df),
+                file_name='NFL_prop_source.csv',
+                mime='text/csv',
+                key='prop_source',
+            )
+
+    if st.button('Simulate Prop Category'):
+                
+        with df_hold_container.container():
+            if prop_type_var == 'All Props':
+                if game_select_var == 'Aggregate':
+                    prop_df_raw = prop_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+                    sim_vars = ['NFL_GAME_PLAYER_PASSING_YARDS', 'NFL_GAME_PLAYER_RUSHING_YARDS', 'NFL_GAME_PLAYER_PASSING_ATTEMPTS', 'NFL_GAME_PLAYER_PASSING_TOUCHDOWNS', 'NFL_GAME_PLAYER_RUSHING_ATTEMPTS',
+                                'NFL_GAME_PLAYER_RECEIVING_RECEPTIONS', 'NFL_GAME_PLAYER_RECEIVING_YARDS', 'NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS']
+                elif game_select_var == 'Pick6':
+                    prop_df_raw = pick_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+                    sim_vars = ['Rush + Rec Yards', 'Rush + Rec TDs', 'Passing Yards', 'Passing Attempts', 'Passing TDs', 'Rushing Attempts', 'Rushing Yards', 'Receptions', 'Receiving Yards', 'Receiving TDs']
+                
+                player_df = overall_stats.copy()
+                
+                for prop in sim_vars:
+                        
+                    for books in book_selections:
+                        prop_df = prop_df_raw[prop_df_raw['book'] == books]
+                        prop_df = prop_df[prop_df['prop_type'] == prop]
+                        prop_df = prop_df[~((prop_df['over_prop'] < 15) & (prop_df['prop_type'] == 'NFL_GAME_PLAYER_RUSHING_YARDS'))]
+                        prop_df = prop_df[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+                        prop_df.rename(columns={"over_prop": "Prop"}, inplace = True)
+                        prop_df['Over'] = 1 / prop_df['over_line']
+                        prop_df['Under'] = 1 / prop_df['under_line']
+
+                        prop_dict = dict(zip(prop_df.Player, prop_df.Prop))
+                        prop_type_dict = dict(zip(prop_df.Player, prop_df.prop_type))
+                        book_dict = dict(zip(prop_df.Player, prop_df.book))
+                        over_dict = dict(zip(prop_df.Player, prop_df.Over))
+                        under_dict = dict(zip(prop_df.Player, prop_df.Under))
+                        trending_over_dict = dict(zip(prop_df.Player, prop_df['Trending Over']))
+                        trending_under_dict = dict(zip(prop_df.Player, prop_df['Trending Under']))
+
+                        player_df['book'] = player_df['Player'].map(book_dict)
+                        player_df['Prop'] = player_df['Player'].map(prop_dict)
+                        player_df['prop_type'] = player_df['Player'].map(prop_type_dict)
+                        player_df['Trending Over'] = player_df['Player'].map(trending_over_dict)
+                        player_df['Trending Under'] = player_df['Player'].map(trending_under_dict)
+
+                        df = player_df.reset_index(drop=True)
+
+                        team_dict = dict(zip(df.Player, df.Team))
+                        
+                        total_sims = 1000
+
+                        df.replace("", 0, inplace=True)
+                        
+                        if prop == "NFL_GAME_PLAYER_PASSING_YARDS" or prop == "Passing Yards":
+                            df['Median'] = df['pass_yards']
+                        elif prop == "NFL_GAME_PLAYER_RUSHING_YARDS" or prop == "Rushing Yards":
+                            df['Median'] = df['rush_yards']
+                        elif prop == "NFL_GAME_PLAYER_PASSING_ATTEMPTS" or prop == "Passing Attempts":
+                            df['Median'] = df['pass_att']
+                        elif prop == "NFL_GAME_PLAYER_PASSING_TOUCHDOWNS" or prop == "Passing TDs":
+                            df['Median'] = df['pass_tds']
+                        elif prop == "NFL_GAME_PLAYER_RUSHING_ATTEMPTS" or prop == "Rushing Attempts":
+                            df['Median'] = df['rush_att']
+                        elif prop == "NFL_GAME_PLAYER_RECEIVING_RECEPTIONS" or prop == "Receptions":
+                            df['Median'] = df['rec']
+                        elif prop == "NFL_GAME_PLAYER_RECEIVING_YARDS" or prop == "Receiving Yards":
+                            df['Median'] = df['rec_yards']
+                        elif prop == "NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS" or prop == "Receiving TDs":
+                            df['Median'] = df['rec_tds']
+                        elif prop == "Rush + Rec Yards":
+                            df['Median'] = df['rush_yards'] + df['rec_yards']
+                        elif prop == "Rush + Rec TDs":
+                            df['Median'] = df['rush_tds'] + df['rec_tds']
                             
-                            for prop in sim_vars:
-                                    
-                                for books in book_selections:
-                                    prop_df = prop_df_raw[prop_df_raw['book'] == books]
-                                    prop_df = prop_df[prop_df['prop_type'] == prop]
-                                    prop_df = prop_df[~((prop_df['over_prop'] < 15) & (prop_df['prop_type'] == 'NFL_GAME_PLAYER_RUSHING_YARDS'))]
-                                    prop_df = prop_df[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-                                    prop_df.rename(columns={"over_prop": "Prop"}, inplace = True)
-                                    prop_df['Over'] = 1 / prop_df['over_line']
-                                    prop_df['Under'] = 1 / prop_df['under_line']
-
-                                    prop_dict = dict(zip(prop_df.Player, prop_df.Prop))
-                                    prop_type_dict = dict(zip(prop_df.Player, prop_df.prop_type))
-                                    book_dict = dict(zip(prop_df.Player, prop_df.book))
-                                    over_dict = dict(zip(prop_df.Player, prop_df.Over))
-                                    under_dict = dict(zip(prop_df.Player, prop_df.Under))
-
-                                    player_df['book'] = player_df['Player'].map(book_dict)
-                                    player_df['Prop'] = player_df['Player'].map(prop_dict)
-                                    player_df['prop_type'] = player_df['Player'].map(prop_type_dict)
-
-                                    df = player_df.reset_index(drop=True)
-
-                                    team_dict = dict(zip(df.Player, df.Team))
-                                    
-                                    total_sims = 1000
-            
-                                    df.replace("", 0, inplace=True)
-                                    
-                                    if prop == "NFL_GAME_PLAYER_PASSING_YARDS" or prop == "Passing Yards":
-                                        df['Median'] = df['pass_yards']
-                                    elif prop == "NFL_GAME_PLAYER_RUSHING_YARDS" or prop == "Rushing Yards":
-                                        df['Median'] = df['rush_yards']
-                                    elif prop == "NFL_GAME_PLAYER_PASSING_ATTEMPTS" or prop == "Passing Attempts":
-                                        df['Median'] = df['pass_att']
-                                    elif prop == "NFL_GAME_PLAYER_PASSING_TOUCHDOWNS" or prop == "Passing TDs":
-                                        df['Median'] = df['pass_tds']
-                                    elif prop == "NFL_GAME_PLAYER_RUSHING_ATTEMPTS" or prop == "Rushing Attempts":
-                                        df['Median'] = df['rush_att']
-                                    elif prop == "NFL_GAME_PLAYER_RECEIVING_RECEPTIONS" or prop == "Receptions":
-                                        df['Median'] = df['rec']
-                                    elif prop == "NFL_GAME_PLAYER_RECEIVING_YARDS" or prop == "Receiving Yards":
-                                        df['Median'] = df['rec_yards']
-                                    elif prop == "NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS" or prop == "Receiving TDs":
-                                        df['Median'] = df['rec_tds']
-                                    elif prop == "Rush + Rec Yards":
-                                        df['Median'] = df['rush_yards'] + df['rec_yards']
-                                    elif prop == "Rush + Rec TDs":
-                                        df['Median'] = df['rush_tds'] + df['rec_tds']
-                                        
-                                    flex_file = df.copy()
-                                    flex_file['Floor'] = flex_file['Median'] * .25
-                                    flex_file['Ceiling'] = flex_file['Median'] + (flex_file['Median'] * 1.75)
-                                    flex_file['STD'] = flex_file['Median'] / 4
-                                    flex_file['Prop'] = flex_file['Player'].map(prop_dict)
-                                    flex_file = flex_file[['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD']]
-            
-                                    hold_file = flex_file.copy()
-                                    overall_file = flex_file.copy()
-                                    prop_file = flex_file.copy()
-                                          
-                                    overall_players = overall_file[['Player']]
-            
-                                    for x in range(0,total_sims):    
-                                        prop_file[x] = prop_file['Prop']
-            
-                                    prop_file = prop_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
-            
-                                    for x in range(0,total_sims):
-                                        overall_file[x] = np.random.normal(overall_file['Median'],overall_file['STD'])
-            
-                                    overall_file=overall_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
-            
-                                    players_only = hold_file[['Player']]
-            
-                                    player_outcomes = pd.merge(players_only, overall_file, left_index=True, right_index=True)
-            
-                                    prop_check = (overall_file - prop_file)
-            
-                                    players_only['Mean_Outcome'] = overall_file.mean(axis=1)
-                                    players_only['Book'] = players_only['Player'].map(book_dict)
-                                    players_only['Prop'] = players_only['Player'].map(prop_dict)
-                                    players_only['poisson_var'] = players_only.apply(calculate_poisson, axis=1)
-                                    players_only['10%'] = overall_file.quantile(0.1, axis=1)
-                                    players_only['90%'] = overall_file.quantile(0.9, axis=1)
-                                    players_only['Over'] = np_where(players_only['Prop'] <= 3, players_only['poisson_var'], prop_check[prop_check > 0].count(axis=1)/float(total_sims))
-                                    players_only['Imp Over'] = players_only['Player'].map(over_dict)
-                                    players_only['Over%'] = players_only[["Over", "Imp Over"]].mean(axis=1)
-                                    players_only['Under'] = np_where(players_only['Prop'] <= 3, 1 - players_only['poisson_var'], prop_check[prop_check < 0].count(axis=1)/float(total_sims))
-                                    players_only['Imp Under'] = players_only['Player'].map(under_dict)
-                                    players_only['Under%'] = players_only[["Under", "Imp Under"]].mean(axis=1)
-                                    players_only['Prop_avg'] = players_only['Prop'].mean() / 100
-                                    players_only['prop_threshold'] = .10
-                                    players_only = players_only[players_only['Mean_Outcome'] > 0]
-                                    players_only['Over_diff'] = players_only['Over%'] - players_only['Imp Over']
-                                    players_only['Under_diff'] = players_only['Under%'] - players_only['Imp Under']
-                                    players_only['Bet_check'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], players_only['Over_diff'] , players_only['Under_diff'])
-                                    players_only['Bet_suggest'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], "Over" , "Under")
-                                    players_only['Bet?'] = np.where(players_only['Bet_check'] >= players_only['prop_threshold'], players_only['Bet_suggest'], "No Bet")
-                                    players_only['Edge'] = players_only['Bet_check']
-                                    players_only['Prop Type'] = prop
-            
-                                    players_only['Player'] = hold_file[['Player']]
-                                    players_only['Team'] = players_only['Player'].map(team_dict)
-            
-                                    leg_outcomes = players_only[['Player', 'Team', 'Book', 'Prop Type', 'Prop', 'Mean_Outcome', 'Imp Over', 'Over%', 'Imp Under', 'Under%', 'Bet?', 'Edge']]
-                                    sim_all_hold = pd.concat([sim_all_hold, leg_outcomes], ignore_index=True)
-                                    
-                                    final_outcomes = sim_all_hold
-                                    st.write(f'finished {prop} for {books}')
+                        flex_file = df.copy()
+                        flex_file['Floor'] = flex_file['Median'] * .25
+                        flex_file['Ceiling'] = flex_file['Median'] + (flex_file['Median'] * 1.75)
+                        flex_file['STD'] = flex_file['Median'] / 4
+                        flex_file['Prop'] = flex_file['Player'].map(prop_dict)
+                        flex_file = flex_file[['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD']]
+
+                        hold_file = flex_file.copy()
+                        overall_file = flex_file.copy()
+                        prop_file = flex_file.copy()
                                 
-                        elif prop_type_var != 'All Props':
+                        overall_players = overall_file[['Player']]
 
-                            player_df = overall_stats.copy()
+                        for x in range(0,total_sims):    
+                            prop_file[x] = prop_file['Prop']
 
-                            if game_select_var == 'Aggregate':
-                                prop_df_raw = prop_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-                            elif game_select_var == 'Pick6':
-                                prop_df_raw = pick_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-                                
-                            for books in book_selections:
-                                prop_df = prop_df_raw[prop_df_raw['book'] == books]
-                                
-                                if prop_type_var == "NFL_GAME_PLAYER_PASSING_YARDS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_PASSING_YARDS']
-                                elif prop_type_var == "Passing Yards":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Passing Yards']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_YARDS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RUSHING_YARDS']
-                                elif prop_type_var == "Rushing Yards":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Rushing Yards']
-                                elif prop_type_var == "NFL_GAME_PLAYER_PASSING_ATTEMPTS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_PASSING_ATTEMPTS']
-                                elif prop_type_var == "Passing Attempts":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Passing Attempts']
-                                elif prop_type_var == "NFL_GAME_PLAYER_PASSING_TOUCHDOWNS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_PASSING_TOUCHDOWNS']
-                                elif prop_type_var == "Passing TDs":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Passing TDs']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_ATTEMPTS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RUSHING_ATTEMPTS']
-                                elif prop_type_var == "Rushing Attempts":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Rushing Attempts']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_RECEPTIONS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RECEIVING_RECEPTIONS']
-                                elif prop_type_var == "Receptions":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Receptions']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_YARDS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RECEIVING_YARDS']
-                                elif prop_type_var == "Receiving Yards":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Receiving Yards']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS']
-                                elif prop_type_var == "Receiving TDs":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Receiving TDs']
-                                elif prop_type_var == "Rush + Rec Yards":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Rush + Rec Yards']
-                                elif prop_type_var == "Rush + Rec TDs":
-                                    prop_df = prop_df[prop_df['prop_type'] == 'Rush + Rec TDs']
-
-                                prop_df = prop_df[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type']]
-                                prop_df = prop_df.rename(columns={"over_prop": "Prop"})
-                                prop_df['Over'] = 1 / prop_df['over_line']
-                                prop_df['Under'] = 1 / prop_df['under_line']
-
-                                prop_dict = dict(zip(prop_df.Player, prop_df.Prop))
-                                prop_type_dict = dict(zip(prop_df.Player, prop_df.prop_type))
-                                book_dict = dict(zip(prop_df.Player, prop_df.book))
-                                over_dict = dict(zip(prop_df.Player, prop_df.Over))
-                                under_dict = dict(zip(prop_df.Player, prop_df.Under))
-
-                                player_df['book'] = player_df['Player'].map(book_dict)
-                                player_df['Prop'] = player_df['Player'].map(prop_dict)
-                                player_df['prop_type'] = player_df['Player'].map(prop_type_dict)
-
-                                df = player_df.reset_index(drop=True)
-
-                                team_dict = dict(zip(df.Player, df.Team))
-                                
-                                total_sims = 1000
-        
-                                df.replace("", 0, inplace=True)
-                                
-                                if prop_type_var == "NFL_GAME_PLAYER_PASSING_YARDS" or prop_type_var == "Passing Yards":
-                                    df['Median'] = df['pass_yards']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_YARDS" or prop_type_var == "Rushing Yards":
-                                    df['Median'] = df['rush_yards']
-                                elif prop_type_var == "NFL_GAME_PLAYER_PASSING_ATTEMPTS" or prop_type_var == "Passing Attempts":
-                                    df['Median'] = df['pass_att']
-                                elif prop_type_var == "NFL_GAME_PLAYER_PASSING_TOUCHDOWNS" or prop_type_var == "Passing TDs":
-                                    df['Median'] = df['pass_tds']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_ATTEMPTS" or prop_type_var == "Rushing Attempts":
-                                    df['Median'] = df['rush_att']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_RECEPTIONS" or prop_type_var == "Receptions":
-                                    df['Median'] = df['rec']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_YARDS" or prop_type_var == "Receiving Yards":
-                                    df['Median'] = df['rec_yards']
-                                elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS" or prop_type_var == "Receiving TDs":
-                                    df['Median'] = df['rec_tds']
-                                elif prop_type_var == "Rush + Rec Yards":
-                                    df['Median'] = df['rush_yards'] + df['rec_yards']
-                                elif prop_type_var == "Rush + Rec TDs":
-                                    df['Median'] = df['rush_tds'] + df['rec_tds']
-        
-                                flex_file = df.copy()
-                                flex_file['Floor'] = flex_file['Median'] * .25
-                                flex_file['Ceiling'] = flex_file['Median'] + (flex_file['Median'] * 1.75)
-                                flex_file['STD'] = flex_file['Median'] / 4
-                                flex_file['Prop'] = flex_file['Player'].map(prop_dict)
-                                flex_file = flex_file[['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD']]
-        
-                                hold_file = flex_file.copy()
-                                overall_file = flex_file.copy()
-                                prop_file = flex_file.copy()
-                                      
-                                overall_players = overall_file[['Player']]
-        
-                                for x in range(0,total_sims):    
-                                    prop_file[x] = prop_file['Prop']
-        
-                                prop_file = prop_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
-        
-                                for x in range(0,total_sims):
-                                    overall_file[x] = np.random.normal(overall_file['Median'],overall_file['STD'])
-        
-                                overall_file=overall_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
-        
-                                players_only = hold_file[['Player']]
-        
-                                player_outcomes = pd.merge(players_only, overall_file, left_index=True, right_index=True)
-        
-                                prop_check = (overall_file - prop_file)
-        
-                                players_only['Mean_Outcome'] = overall_file.mean(axis=1)
-                                players_only['Book'] = players_only['Player'].map(book_dict)
-                                players_only['Prop'] = players_only['Player'].map(prop_dict)
-                                players_only['poisson_var'] = players_only.apply(calculate_poisson, axis=1)
-                                players_only['10%'] = overall_file.quantile(0.1, axis=1)
-                                players_only['90%'] = overall_file.quantile(0.9, axis=1)
-                                players_only['Over'] = np_where(players_only['Prop'] <= 3, players_only['poisson_var'], prop_check[prop_check > 0].count(axis=1)/float(total_sims))
-                                players_only['Imp Over'] = players_only['Player'].map(over_dict)
-                                players_only['Over%'] = players_only[["Over", "Imp Over"]].mean(axis=1)
-                                players_only['Under'] = np_where(players_only['Prop'] <= 3, 1 - players_only['poisson_var'], prop_check[prop_check < 0].count(axis=1)/float(total_sims))
-                                players_only['Imp Under'] = players_only['Player'].map(under_dict)
-                                players_only['Under%'] = players_only[["Under", "Imp Under"]].mean(axis=1)
-                                players_only['Prop_avg'] = players_only['Prop'].mean() / 100
-                                players_only['prop_threshold'] = .10
-                                players_only = players_only[players_only['Mean_Outcome'] > 0]
-                                players_only['Over_diff'] = players_only['Over%'] - players_only['Imp Over']
-                                players_only['Under_diff'] = players_only['Under%'] - players_only['Imp Under']
-                                players_only['Bet_check'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], players_only['Over_diff'] , players_only['Under_diff'])
-                                players_only['Bet_suggest'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], "Over" , "Under")
-                                players_only['Bet?'] = np.where(players_only['Bet_check'] >= players_only['prop_threshold'], players_only['Bet_suggest'], "No Bet")
-                                players_only['Edge'] = players_only['Bet_check']
-                                players_only['Prop Type'] = prop_type_var
-        
-                                players_only['Player'] = hold_file[['Player']]
-                                players_only['Team'] = players_only['Player'].map(team_dict)
-        
-                                leg_outcomes = players_only[['Player', 'Team', 'Book', 'Prop Type', 'Prop', 'Mean_Outcome', 'Imp Over', 'Over%', 'Imp Under', 'Under%', 'Bet?', 'Edge']]
-                                sim_all_hold = pd.concat([sim_all_hold, leg_outcomes], ignore_index=True)
-                                
-                                final_outcomes = sim_all_hold
-                                st.write(f'finished {prop_type_var} for {books}')
-                        
-                        final_outcomes = final_outcomes.dropna()
-                        if game_select_var == 'Pick6':
-                            final_outcomes = final_outcomes.drop_duplicates(subset=['Player', 'Prop Type'])
-                        final_outcomes = final_outcomes.sort_values(by='Edge', ascending=False)
+                        prop_file = prop_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
 
-                        with df_hold_container:
-                            df_hold_container = st.empty()
-                            st.dataframe(final_outcomes.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(precision=2), use_container_width = True)
-                        with export_container:
-                            export_container = st.empty()
-                            st.download_button(
-                                label="Export Projections",
-                                data=convert_df_to_csv(final_outcomes),
-                                file_name='NFL_prop_proj.csv',
-                                mime='text/csv',
-                                key='prop_proj',
-                            )
+                        for x in range(0,total_sims):
+                            overall_file[x] = np.random.normal(overall_file['Median'],overall_file['STD'])
+
+                        overall_file=overall_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
+
+                        players_only = hold_file[['Player']]
+
+                        player_outcomes = pd.merge(players_only, overall_file, left_index=True, right_index=True)
+
+                        prop_check = (overall_file - prop_file)
+
+                        players_only['Mean_Outcome'] = overall_file.mean(axis=1)
+                        players_only['Book'] = players_only['Player'].map(book_dict)
+                        players_only['Prop'] = players_only['Player'].map(prop_dict)
+                        players_only['Trending Over'] = players_only['Player'].map(trending_over_dict)
+                        players_only['Trending Under'] = players_only['Player'].map(trending_under_dict)
+                        players_only['poisson_var'] = players_only.apply(calculate_poisson, axis=1)
+                        players_only['10%'] = overall_file.quantile(0.1, axis=1)
+                        players_only['90%'] = overall_file.quantile(0.9, axis=1)
+                        players_only['Over'] = np_where(players_only['Prop'] <= 3, players_only['poisson_var'], prop_check[prop_check > 0].count(axis=1)/float(total_sims))
+                        players_only['Imp Over'] = players_only['Player'].map(over_dict)
+                        players_only['Over%'] = players_only[["Over", "Imp Over", "Trending Over"]].mean(axis=1)
+                        players_only['Under'] = np_where(players_only['Prop'] <= 3, 1 - players_only['poisson_var'], prop_check[prop_check < 0].count(axis=1)/float(total_sims))
+                        players_only['Imp Under'] = players_only['Player'].map(under_dict)
+                        players_only['Under%'] = players_only[["Under", "Imp Under", "Trending Under"]].mean(axis=1)
+                        players_only['Prop_avg'] = players_only['Prop'].mean() / 100
+                        players_only['prop_threshold'] = .10
+                        players_only = players_only[players_only['Mean_Outcome'] > 0]
+                        players_only['Over_diff'] = players_only['Over%'] - players_only['Imp Over']
+                        players_only['Under_diff'] = players_only['Under%'] - players_only['Imp Under']
+                        players_only['Bet_check'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], players_only['Over_diff'] , players_only['Under_diff'])
+                        players_only['Bet_suggest'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], "Over" , "Under")
+                        players_only['Bet?'] = np.where(players_only['Bet_check'] >= players_only['prop_threshold'], players_only['Bet_suggest'], "No Bet")
+                        players_only['Edge'] = players_only['Bet_check']
+                        players_only['Prop Type'] = prop
+
+                        players_only['Player'] = hold_file[['Player']]
+                        players_only['Team'] = players_only['Player'].map(team_dict)
+
+                        leg_outcomes = players_only[['Player', 'Team', 'Book', 'Prop Type', 'Prop', 'Mean_Outcome', 'Imp Over', 'Trending Over', 'Over%', 'Imp Under', 'Trending Under', 'Under%', 'Bet?', 'Edge']]
+                        sim_all_hold = pd.concat([sim_all_hold, leg_outcomes], ignore_index=True)
+                        
+                        final_outcomes = sim_all_hold
+                        st.write(f'finished {prop} for {books}')
+                    
+            elif prop_type_var != 'All Props':
+
+                player_df = overall_stats.copy()
+
+                if game_select_var == 'Aggregate':
+                    prop_df_raw = prop_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+                elif game_select_var == 'Pick6':
+                    prop_df_raw = pick_frame[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+                    
+                for books in book_selections:
+                    prop_df = prop_df_raw[prop_df_raw['book'] == books]
+                    
+                    if prop_type_var == "NFL_GAME_PLAYER_PASSING_YARDS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_PASSING_YARDS']
+                    elif prop_type_var == "Passing Yards":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Passing Yards']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_YARDS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RUSHING_YARDS']
+                    elif prop_type_var == "Rushing Yards":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Rushing Yards']
+                    elif prop_type_var == "NFL_GAME_PLAYER_PASSING_ATTEMPTS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_PASSING_ATTEMPTS']
+                    elif prop_type_var == "Passing Attempts":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Passing Attempts']
+                    elif prop_type_var == "NFL_GAME_PLAYER_PASSING_TOUCHDOWNS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_PASSING_TOUCHDOWNS']
+                    elif prop_type_var == "Passing TDs":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Passing TDs']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_ATTEMPTS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RUSHING_ATTEMPTS']
+                    elif prop_type_var == "Rushing Attempts":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Rushing Attempts']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_RECEPTIONS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RECEIVING_RECEPTIONS']
+                    elif prop_type_var == "Receptions":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Receptions']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_YARDS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RECEIVING_YARDS']
+                    elif prop_type_var == "Receiving Yards":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Receiving Yards']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS":
+                        prop_df = prop_df[prop_df['prop_type'] == 'NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS']
+                    elif prop_type_var == "Receiving TDs":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Receiving TDs']
+                    elif prop_type_var == "Rush + Rec Yards":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Rush + Rec Yards']
+                    elif prop_type_var == "Rush + Rec TDs":
+                        prop_df = prop_df[prop_df['prop_type'] == 'Rush + Rec TDs']
+
+                    prop_df = prop_df[['Player', 'book', 'over_prop', 'over_line', 'under_line', 'prop_type', 'Trending Over', 'Trending Under']]
+                    prop_df = prop_df.rename(columns={"over_prop": "Prop"})
+                    prop_df['Over'] = 1 / prop_df['over_line']
+                    prop_df['Under'] = 1 / prop_df['under_line']
+
+                    prop_dict = dict(zip(prop_df.Player, prop_df.Prop))
+                    prop_type_dict = dict(zip(prop_df.Player, prop_df.prop_type))
+                    book_dict = dict(zip(prop_df.Player, prop_df.book))
+                    over_dict = dict(zip(prop_df.Player, prop_df.Over))
+                    under_dict = dict(zip(prop_df.Player, prop_df.Under))
+                    trending_over_dict = dict(zip(prop_df.Player, prop_df['Trending Over']))
+                    trending_under_dict = dict(zip(prop_df.Player, prop_df['Trending Under']))
+
+                    player_df['book'] = player_df['Player'].map(book_dict)
+                    player_df['Prop'] = player_df['Player'].map(prop_dict)
+                    player_df['prop_type'] = player_df['Player'].map(prop_type_dict)
+                    player_df['Trending Over'] = player_df['Player'].map(trending_over_dict)
+                    player_df['Trending Under'] = player_df['Player'].map(trending_under_dict)
+
+                    df = player_df.reset_index(drop=True)
+
+                    team_dict = dict(zip(df.Player, df.Team))
+                    
+                    total_sims = 1000
+
+                    df.replace("", 0, inplace=True)
+                    
+                    if prop_type_var == "NFL_GAME_PLAYER_PASSING_YARDS" or prop_type_var == "Passing Yards":
+                        df['Median'] = df['pass_yards']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_YARDS" or prop_type_var == "Rushing Yards":
+                        df['Median'] = df['rush_yards']
+                    elif prop_type_var == "NFL_GAME_PLAYER_PASSING_ATTEMPTS" or prop_type_var == "Passing Attempts":
+                        df['Median'] = df['pass_att']
+                    elif prop_type_var == "NFL_GAME_PLAYER_PASSING_TOUCHDOWNS" or prop_type_var == "Passing TDs":
+                        df['Median'] = df['pass_tds']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RUSHING_ATTEMPTS" or prop_type_var == "Rushing Attempts":
+                        df['Median'] = df['rush_att']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_RECEPTIONS" or prop_type_var == "Receptions":
+                        df['Median'] = df['rec']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_YARDS" or prop_type_var == "Receiving Yards":
+                        df['Median'] = df['rec_yards']
+                    elif prop_type_var == "NFL_GAME_PLAYER_RECEIVING_TOUCHDOWNS" or prop_type_var == "Receiving TDs":
+                        df['Median'] = df['rec_tds']
+                    elif prop_type_var == "Rush + Rec Yards":
+                        df['Median'] = df['rush_yards'] + df['rec_yards']
+                    elif prop_type_var == "Rush + Rec TDs":
+                        df['Median'] = df['rush_tds'] + df['rec_tds']
+
+                    flex_file = df.copy()
+                    flex_file['Floor'] = flex_file['Median'] * .25
+                    flex_file['Ceiling'] = flex_file['Median'] + (flex_file['Median'] * 1.75)
+                    flex_file['STD'] = flex_file['Median'] / 4
+                    flex_file['Prop'] = flex_file['Player'].map(prop_dict)
+                    flex_file = flex_file[['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD']]
+
+                    hold_file = flex_file.copy()
+                    overall_file = flex_file.copy()
+                    prop_file = flex_file.copy()
                             
+                    overall_players = overall_file[['Player']]
+
+                    for x in range(0,total_sims):    
+                        prop_file[x] = prop_file['Prop']
+
+                    prop_file = prop_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
+
+                    for x in range(0,total_sims):
+                        overall_file[x] = np.random.normal(overall_file['Median'],overall_file['STD'])
+
+                    overall_file=overall_file.drop(['Player', 'book', 'Prop', 'Floor', 'Median', 'Ceiling', 'STD'], axis=1)
+
+                    players_only = hold_file[['Player']]
+
+                    player_outcomes = pd.merge(players_only, overall_file, left_index=True, right_index=True)
+
+                    prop_check = (overall_file - prop_file)
+
+                    players_only['Mean_Outcome'] = overall_file.mean(axis=1)
+                    players_only['Book'] = players_only['Player'].map(book_dict)
+                    players_only['Prop'] = players_only['Player'].map(prop_dict)
+                    players_only['Trending Over'] = players_only['Player'].map(trending_over_dict)
+                    players_only['Trending Under'] = players_only['Player'].map(trending_under_dict)
+                    players_only['poisson_var'] = players_only.apply(calculate_poisson, axis=1)
+                    players_only['10%'] = overall_file.quantile(0.1, axis=1)
+                    players_only['90%'] = overall_file.quantile(0.9, axis=1)
+                    players_only['Over'] = np_where(players_only['Prop'] <= 3, players_only['poisson_var'], prop_check[prop_check > 0].count(axis=1)/float(total_sims))
+                    players_only['Imp Over'] = players_only['Player'].map(over_dict)
+                    players_only['Over%'] = players_only[["Over", "Imp Over", "Trending Over"]].mean(axis=1)
+                    players_only['Under'] = np_where(players_only['Prop'] <= 3, 1 - players_only['poisson_var'], prop_check[prop_check < 0].count(axis=1)/float(total_sims))
+                    players_only['Imp Under'] = players_only['Player'].map(under_dict)
+                    players_only['Under%'] = players_only[["Under", "Imp Under", "Trending Under"]].mean(axis=1)
+                    players_only['Prop_avg'] = players_only['Prop'].mean() / 100
+                    players_only['prop_threshold'] = .10
+                    players_only = players_only[players_only['Mean_Outcome'] > 0]
+                    players_only['Over_diff'] = players_only['Over%'] - players_only['Imp Over']
+                    players_only['Under_diff'] = players_only['Under%'] - players_only['Imp Under']
+                    players_only['Bet_check'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], players_only['Over_diff'] , players_only['Under_diff'])
+                    players_only['Bet_suggest'] = np.where(players_only['Over_diff'] > players_only['Under_diff'], "Over" , "Under")
+                    players_only['Bet?'] = np.where(players_only['Bet_check'] >= players_only['prop_threshold'], players_only['Bet_suggest'], "No Bet")
+                    players_only['Edge'] = players_only['Bet_check']
+                    players_only['Prop Type'] = prop_type_var
+
+                    players_only['Player'] = hold_file[['Player']]
+                    players_only['Team'] = players_only['Player'].map(team_dict)
+
+                    leg_outcomes = players_only[['Player', 'Team', 'Book', 'Prop Type', 'Prop', 'Mean_Outcome', 'Imp Over', 'Trending Over', 'Over%', 'Imp Under', 'Trending Under', 'Under%', 'Bet?', 'Edge']]
+                    sim_all_hold = pd.concat([sim_all_hold, leg_outcomes], ignore_index=True)
+                    
+                    final_outcomes = sim_all_hold
+                    st.write(f'finished {prop_type_var} for {books}')
+            
+            final_outcomes = final_outcomes.dropna()
+            if game_select_var == 'Pick6':
+                final_outcomes = final_outcomes.drop_duplicates(subset=['Player', 'Prop Type'])
+            final_outcomes = final_outcomes.sort_values(by='Edge', ascending=False)
+
+            with df_hold_container:
+                df_hold_container = st.empty()
+                st.dataframe(final_outcomes.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(precision=2), use_container_width = True)
+            with export_container:
+                export_container = st.empty()
+                st.download_button(
+                    label="Export Projections",
+                    data=convert_df_to_csv(final_outcomes),
+                    file_name='NFL_prop_proj.csv',
+                    mime='text/csv',
+                    key='prop_proj',
+                )
+