working a bit nicer now