First check-in of version 3