lot of changes (prefer meteor ways)