merging recent ejbaird work to rohanmaddamsetti repo