cleaned up ziggs a bit