mix vs min
Merge branch 'newhome' into testing