This should be updated to work with ver 3.4 :]