Final prototype changes