update to use rivets for quick input