Much better, now it's much more dynamic