More work on porting GP win scene