Added some more really nice code