Some improvement but still shaky