some changes added on my branch