added if elses