updated to Jojo's version