final changes requested by Swami