Removed JS change of approach needed