taj commit
whole solution