Major updates for prototype