Made Mike's changes