Merge branch 'logic'