accepting Dan's changes
accepting Dan's changes