updated changes below (ooh, triple meaning)