Adding some stuff from ytrc