Commented out too much in last commit