Removing toast
Taking Beck's changes
Minor commits