Added everything from 4,5 except sim, theta