updated to latest version (almost finish bonus)