Adding changes suggested by Husky (Scholtz)