More work on the credits state