changes to get working