Several changes after first prototype