Much prettier and it works now