Yes, this is definitely better and simpler. :)