merge changes from tinky