Fixed sept 4/5 13 stuff