Fixed ass5 bugs