Alex edit branch

Added to show the toasts.
@Vylegzv