Added take and drop