Kayvan/adding status