Updated with Requested Changes