Accounting for Mike's changes