Jordie's changes