Simplified Gato class sub

Top