Reworked - added base image