improved

still not functioning fully