changes from master in models