Updated different element pieces etc