Agree on that, will try to make it more compact.