Some updates // working state