added enum, created new methods