siting code changes to be more flexible