Input Jay's fixes