Simplified steps and features as per review with Tony