updated to work with 1.4