updated jsx to match sdpalley's excellent improvements