simplified a bit
updates