Version 2.0 - first batch design