Rework to not use meteor