Small changes Tom Asked for