merged overivew from elements branch