Fixed but with theta, now completley functional