weekly bug fix
merge from weekFunction