Better scene handling.