Updated as new methods finished