Arindam: Updating the working version of popup