Made further modifications