Now working better