Added Mr.J's stuff