+1. Nice that we get rid of this :)