GPK - Modified build