some changes for most recent version