addressed gijs' comments