added methods
merged conflicts