updated basics and images
manual merge