Week1 general improvements