Implemented after official announcement