adding some stuff from Dane