Modified Generic to generic