more newer stuff than before