refactored following change in base image