removed duplicates
draft updated