Enhancing thin shell mode- need to clean this up!