added stuff from Dragoon