Waning fix + Fix background issue