Updated to prevent stacking messages showing on top of each other