Made nicer