Code working with v1