adding some stuff from prev assignment