Game states working better