adopted bric3 suggestions