final touches. works fast on ugrad and grad now