Updated Commit based on recent adjustments