changes in this file
A3 done. A2 needs testing