updated
proof that i too need sleep, removed extra bits that were causing problems