Cleaned up RBF