Initial changes for prototyping popup.