ENH: Better scene coverage