Jit's work

Please review and make your comments.