first commit of new architecture