Fixed Zach's Problems    :)