Safety first!

Signed-off-by: Suki <suki@missallsunday.com>
Changes on Display

Signed-off-by: Suki <suki@missallsunday.com>
Revert some changes...

Signed-off-by: Suki <suki@missallsunday.com>