Final changes, ordered prototype