Made further modifications and additions