FINAL FIX REST