dark version, some changes