Fixed some things and simplified 6.1