some small changes: dhiraj