Cleaned GS and added If no last value check