More changes, but now...
i don't have idea about how i going to change this...