-_- ... redoing things bcoz of changes :/