Some cleaning + Galileo added + pistol stack