First Class revamp