putting back language, moving constants