some changes to get working