Ok, will refactor. Thanks!