everal changes added