works much better than before