Fixed output and added street level