Revert 8170144..5e06a29

This rolls back to commit 817014426241047ad59a846953886611c51d5c96.
p5 working
update pic