added some stuff for 2a