minor changes to get working