Fixed API
Merged conflicts