CHANGES after first prototype