Added some new codes