modified to suggestion AdJ