Updated to current version 4.7