1235merged pic #30 &27#40