Final version, extra space cleaned up