ddlooping's changes (no idea what went in here)