More filtering and updating. Should now work with Atmosphere 2.0.0.RC5