All of this is unnecessary at the new fjs