Combined the latest code

Combined the latest code