Minor Changes... Throws a NullPointerException, no idea why.