@haroonrasheed333 You might want to test this out but it seems like you should be able to make use of ruby's `||` (or conditions) to simplify reading this code. So instead of the separate if..else block this might be slimmed down to one line (i'm going under the assumption that session[:original_user_id] will be nil when it's not defined most of the time, not a blank string, which is something worth testing).

``bash
auth_user_id = session[:original_user_id] || user_uid
``bash