Couple more modifications