import latest changes from damysteryman/JoostinOnline