Looks much better now, works much better now