Toast replacement

Several Toast replacements