new addition + minor changes