Fixed & Added some methods