Added some really nice code