Made changes to get working again