Working much better now