finally adding all ex4 stuff, for real this time