fixed the none at the end