fixing this old thing a little