added tissue support and pep8ified