Minor modifications based on input data