Updated with else case for non init