Implemented new proto-design