Final prototype changes for real