removed pesky conditional