Updated - Added bunch of cool things