Hacked code back into functionality.