Added tuan's code + changed author names