added several activity and logic