trying to work around wrong merge
GDD
revision 9