Update of Bills code to include new changes