Beta version without server-side