Update names and play around with extracting elements