interface, lineups
merge changes