Minor changes for first prototype