Added more checks to app