added if conditional