integrated changes done by Ramon