Can we rework this so that it isn't a chained multi line block?