incorporated takis’s changes