Some changes to try and get image upload working but its being annoying