Added more methods
Merged stuff