killed sigofmu
insignificant changes
insignificant changes
merged from Bruno
insignificant commit