Seems betterer somehow