Theta needs to be rewritten, commenting out for now