Latest prototype changes