Small addition and changes