Added version with correct Preview implementation