Added the entry check..