Some updates
hmm