New methods
New methods
Almost complete