Switching to beta invite model
Small improvements