pls merge the changes off the last weeks