Just an update of the fork.. No progress :(