additional design resources
merge upstream