Made it alot simpler