more updates, playing with YR thing