Some updates working