Modified to use image for poi and merged with Richards code