changes as per #5