adding some stuff from intro class