Increase strictness
Add EKG