Changed to more objective programming :/