Made some progresses