Updated to current version