Better! And tested with external client