Updated to handle get shift by state

Updated to handle get shift by state