Need to remove trailing conditional here