Combined Tejas and Mine

Also Improved cus Teja forgot a "}"