added updates from Vinayan