added else condition on setup