yaoi updated and refactored