Extended remake version

NEXT