dsa

merged chat with main frame