add two proposals from Dustin