BC - added my stuff with Tims manually