Updating from Manoj's repository 2