Updated double pointer magic.  Not too sure if it will work