first 2 popups plus build files
merged with niki