changes for usage with tincan