initial changes to get things working properly