Cleaned up and viber