Tidying up and crossing fingers