cleanup. works now