merge Fagga's changes in to Mine