removed boolean stuff