addded some stuff