remerged dudyk's additions.