Updating Code for additional needs