Updated to work with MW 1.24wmf9 basically.