Bringing in Fletcher's changes