changes to make everything work