Fixed collision and added an image cache