Added option to check for presence of EDD